fix: don't prompt for creds for local models #567
Conversation
Signed-off-by: Grant Linville <[email protected]>
| var env map[string]string | ||
| if err := json.Unmarshal([]byte(authCfg.Password), &env); err != nil { | ||
| return Credential{}, err | ||
| if authCfg.Password != "" { |
There was a problem hiding this comment.
This fixes a bug where we would try to unmarshal an empty string.
| toolURL, err := url.Parse(toolName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // Save the path so we can put it back after removing it. | ||
| path := toolURL.Path | ||
| toolURL.Path = "" | ||
|
|
||
| toolName = toolURL.String() + ":" + possiblePortNumber + path | ||
| ctx = strings.TrimSuffix(ctx, ":"+possiblePortNumber) |
There was a problem hiding this comment.
This fixes a bug where we were putting the port after the path.
I.e., the string we're trying to fix is http://localhost/v1///default:5555 and we used to make it become http://localhost/v1:5555 rather than http://localhost:5555/v1.
| @@ -108,7 +108,7 @@ func (c *Client) clientFromURL(ctx context.Context, apiURL string) (*openai.Clie | |||
| env := "GPTSCRIPT_PROVIDER_" + env2.ToEnvLike(parsed.Hostname()) + "_API_KEY" | |||
| key := os.Getenv(env) | |||
|
|
|||
| if key == "" { | |||
| if key == "" && !isLocalhost(apiURL) { | |||
There was a problem hiding this comment.
Here, we no longer look for the credential in the store if the model is running locally. Not sure whether we care to support IPv6 (::1) here, but I can add that if we do.
| if alias != "" && !isAlphaNumeric(alias) { | ||
| return "", "", nil, fmt.Errorf("credential alias must be alphanumeric") | ||
| } |
There was a problem hiding this comment.
I decided to add a constraint that a credential alias needs to be alphanumeric. This is to avoid interfering with credentials for model providers and such.
g-linville
requested review from
thedadams,
njhale,
StrongMonkey,
iwilltry42 and
tylerslaton
Signed-off-by: Grant Linville <[email protected]>
for #509
Details in comments.